Merge "EtcdConfig: use array_key_exists(), the value can be null"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 28 Apr 2017 12:27:28 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Apr 2017 12:27:29 +0000 (12:27 +0000)
includes/config/EtcdConfig.php

index d3fbd65..06d8dfb 100644 (file)
@@ -251,7 +251,7 @@ class EtcdConfig implements Config, LoggerAwareInterface {
 
                        $name = basename( $node['key'] );
                        $value = $this->unserialize( $node['value'] );
-                       if ( !is_array( $value ) || !isset( $value['val'] ) ) {
+                       if ( !is_array( $value ) || !array_key_exists( 'val', $value ) ) {
                                return [ null, "Failed to parse value for '$name'.", false ];
                        }